Refactoring. PhotoService, not tested (!) yet.