Added more metaclass stuff