added definitions for number and date/timestamp form elements