Implement API management
Add test coverage
Update controller