Added generic mapping support