improve albums managment