Adding draft roles selection