Finalising database model

Getting closer to a final database model. Ruled by a single distributor
object.