Added a flexible targer mapper mechanism