Phase 3 of changes from feature/modules_integration

Can stage_id be missing?