Updated command construction to be compatible with console