Use the new Selector instead of the existing mess