Add support for other options of fay