Move MessageRegistry into impl for refactor