Added entity and player classes