Added class aliasing
Added alias method to extend class + clean up some code