Further centralize CLI registration