Updated to reflect latest CommandBook changes