Updated commands to use passed in parameters