Add code refactoring regarding to selector performance