Improve user module