Refactored away the CNG types