Added @p and variable support to CommandItems.