Improve password module