Moved parsing to appDelegate