Add some more entity type creation
Fix rake task that imports data to global registry