Fix parsing server data into Collections and Collection.fromJs