* Refactored a bit
* Added some utility to extend classes