BUG-432: Start fixing the Registration contract