update architecture and add staging server