Beginning to refine types for raw data