Added world & entity classes