added date control support