Some update for usability