Make symbol lookup more generic. Also map scenes