Added selector feature