Changed to list of registrations
Fixes