Adding unions and advanced mapping.