Maintenance update for Modules and stage