Added draft for Selector