Refactored processes and messages