Added support for fields needed for basic operations