Adding marginalization awareness in Terra.