Now handles command dict fine