Reworking things to avoid entity classes edits