Removed synchronized blocks to atomic reference updates