Adding select field support