Prepare framework for wmc_tool

Some modification into the code is needed to allow the wmc_tool to be used.