Replace simple fields with objects