File repository without create operation added + Some refactoring.