replaced fields with properties