Added scenery support