Added Entity and World classes for later use