Add organization prototype part 7