Update fieldMap to match use of Maybe in Parent