Upgraded FileSource View / View Model