Change to module from Passwd class