Added in a couple of additional modules