+ Refactor Dialog API