Goal block diagram items are now in separate templates