Updated SceneObject and Demo class