Improve use registry