Add class_context, better form in method