Add skip formatting option to rebuild