Adding date and keyword fields