Better interface with waf