Updates to account for command namespace