Added support for user select