Use File object instead of file_url
Fixed description field
Merge branch 'refactor-use-file' into develop