Change package and add fields for suggesting and higlighting