Pattern logic & update prepares

* Define all class pattern extends
* Fix small issues with compatable