Added fields for mapping source <-> Java