Moved behavior into selector