Started Refactoring entity classes to have a common superclass to pull together common persistence code