Refactored data parsing.