[IM] Adding new fields and more improvements in gereal