Add types to notice fields