Registry support in cli