Updates to match new requirements with SureFile-Lib