Add support for selection