Refactored FileParser to use Block