add super mapping support