adapt generator to new generic property tasks