Better handling of mass commands