Updates for moving to standard command based functions
Updates for moving to standard command based functions