Revert to 2 classes until ModAPITransformer working properly