Removed monkey patching, use mixins instead