Added support for select elements