Updated Registry to avoid extraneous type conversions