Changes for scene builder