Add support for Virtual fields