Added support for base table virtual fields and external virtual fields