Updates for new command stuff