Added support for Virtual Fields in API