Updated package diagram