Improve albums management