More world and entity framework