Added entity class and entity modifier implementations.