Add initial extend classes and tests