Add LockManager and updated Zone&PresenceManager