improve Registry management