Added custom dialog wrapper