added user auto mapping