Add more entities
Add hive lines and remove id text