Added support for character selection