Some improvments and add UserHelper