added Album and Artist classes