Refactor code and do more work on import function
Update ide helpers and remember to include new utils class