Added Class resolver methods