Add namespaces and complete ATK.