Expect big changes with Bard and Machinist in 3.1