Updated schema revision to 22