Converted ClassRef, work on related stuff