Add the commons_bw module back. Accidentally remove it in the last commit