[WIP] Mapped superclass

Refactored classes to allow usage out of the box or ease ability to override classes used
I prefer to keep things as it is until your PR gets merged