Added FileSerializer implementation + fixed bugs