Added command parameter and functions to support