Updated calculated prop mapping.