Revamped file parsing