Continue mapping document fields to model fields