improve API for Registry