Improve specs of registrations