Updated for Atlas 0.17.0 schema changes.