#340 Substitutes can maintain their own data