Added select field support