Remove dependence on AbstractDataModel for registration