Add two missing core commands and implement the new command handling