Modifying property types to match