Added support for 'number' and 'textarea' control types