Integrate new conditions module to activity module