[] Import model refactor and tests