[dev] Fields in Model now a List instead of a Map