Added handling of scene groups