Added support for regular File fields