Added TF2 schema