Adding around selection support