Add date to updateEvents + modularize