Added variant mapping to Gridelements