Changes to FileParser