[NUCCORE-1116] Update to SchemaTool