Updated features and modules 2