Added additional modules