Added support for multi partition fields