seed refactor and import fix