Added option to add tag and time