Updated soft architecture and sql scripts