Add Date field, Label field. Work in progress on Time field