Make more changes to fix eventual consistency problem