Added grouping for messenger send and handle