Updates for robust module (user events)