Revamp MessageFormatter