Added extra API and basic support for scenery