Added timing information
Refactored FileParser