Feature/albumfactory