Better handling of the subscribe messages