Added support for underscore in returntype