Added object locking