changes to handle String as event time