Change from module-activity to block