added Album as own entity