Class diagram update; story #35