Feature/album management