Add support for separate wip counts.