Better handling of hub commands