Added tags and dateTimePicker