Some entity class edits