*8969* Move shared code to parent classes