added user info to mapping- fixed