Decorators fix, replaced metaclass