Added support for scenes