Bug fix
Enable new API for with commands