Added normalizers and changed extractors to correct SP