Added entity and quad classes