refactored locking in Concierge module