Added new modules. - Eric