Added entity class + new doc