Continued working on Entity & World