Edited FileParser