Changes to support bulk selection