Aded several more modules