Bugs:
1. IMPORT with references was broken