Added command namespace and minor adjustments