Updates to structure, additions to dLocation attributes.
import updates.