Move gateway helpers