Refactored UnlockControllerFactory