Updated data class diagram and dictionary