Improve wrapper support for Scene type