Add Message class, remove "inverted" concept, it was too complicated