Adding additional modules

only 3.1.0 compiles for some reason