Modified to be used as an external-waf package