Updates for handling files from form model