Adding selector support. Removing location.