Added two new modules