Add gen_server for remote calls