Implement Select API changes