Added support for select fields