Registration improvements