Added support for graphical user selection