HV-723 Adding constraint annotations on the implementation class