Improve registry handlers.