XD-533 - Add additional options to file source
XD-553 - Add additional options to file source