Cleaned MessageWrapper to use companion objects