chenges in DefineClass