Common Schema - upgraded to 2.2 version