Adds scene/layer support