Improved the scene parser.