Added File utility, and removed duplication.