Beginning of integration of Yojson + simpler format of shapes