Removed VRF info; made all the fields manadatory