Refactor Numeric sub_class