Added activate/deactivate functionality with all modules