Moved messenger deserialisation code