Refactored SFV parsing