Update to match changes in modules responses