Improved factorisation in dialogAttributes