Make compatible with Apontador Api 2.0