CNG and BS-VI compliant vehicles