Added User management. Added timeout to lock.