Added current_album