Removed rather hacky unique field support
better model registry. However keep on getting mapper update errors that needs to be resolved