Add Album entity & simplify interface