More diagram prototyping