Added support for K2 extra field assignments