Switched from rw-locks to synchronized methods.