Added more organizational architecture