Added select handler