refactor with event entity