Fixed: references should be numbered as per json model