Refactor AddFormCommand