Updated more scene parsing