Fixed FormCommand to use unified generator interface