Add support to passwords