Adde more goals & architecture principles.