Added new Selector System