Continue specializing cli functions for contexts