Add type information to script import.
Small refactoring to map demo.