Added setting of enabled / disabled to client and planner