removed separate Registry structure