Added entity classes