Add some command handling