Updated features and modules 3