move functions into AlbumBuilder class