Removed explicit locking since optimistic concurrency works so well