Stripped out mapped superclass strategy and replaced with trait