Adding support for underscoreing the keys