Added DialogController from PS