Changed functionality within FileParser