Updated virtual fields to for changes of June 4