Now supports custom dialog and lots more