Add schema type and attribute names