Updated song object to include more fields, updated all calls where needed