More fine grained locking