Refactor; added @Synchronize