Updated to use improved command dfd handler