Added in missing modules