Add keyword "end"
Modify imports to distinguish module and value paths