Fixed issue with generated output being ambiguous. Now for adding class support.