- Fix comments
- Initial code to allow import of specific Type or function