Refactoring the FileStorage model to encapsulate all the static calls