Added two new modules (beta).