Add eventric-store-remote, Refactor