Work on controllers and repository