Added better selector scope