Updated generic architecture document