Message processor refactor