Add API service; Add error handling in controllers