Included a couple of extra modules