Add option to skip xip generation