Aligned with new selector API