Add support for selecting marks