Improve the locking decorators; @synchronized(lock).