Rework remote defines