Non-smoking event (Dubai)

I enjoyed the party at the Cavalli Club last night, however, I nearly suffocated from all of the smoking going on. I know that this is a long shot, but does anyone else wish there could be an event where smoking is not allowed? I also have a suggestion that water should be free. I know these events are to make money, but Internations was way stingy with the drinks. Overall, it was a very nice event, but to fully enjoy it, I just wanted to add my two cents. Anyway, I do plan to attend more events in the future. I have only been in Dubai two months and last night I felt like I was in the center of it all. I felt like this was the real Dubai. It was great. Lots of beautiful people there.