Some simplifications and a new Message module