Updates for FileRepository classes and some more minor changes