Added Scene support