fixing call sites to support re factored event sourcing