Adding support for file fields (Closes #46)