#72 Registration models now in common class structure for ease of querying