Message Key Refactor