Reduce bugs with Selectors integration