Too soon to include scaffold addon by default