Updates for compatibility w 2.2 and new fields