modify class oo support