Albums logic added