Controller binding refactored