Removed File-model, started using File values instead.