did some updates with userTDG and userMapper