Module management added.