Added support for yahoo compiler