Cant add coreos support to working branch without core change