Started refactoring seeds
Merge branch 'master' into seeds-refactor
Finished with refactor