Changes as per CLI documentation.