Update to use newer selector scheme