Add eager loading of pictures
Refactor routes
Refactor tests