Added support for 'virtual' fields