Changed to generic music database with multiple sources