Added PasswordFileHandler
Changed Consumer to use proper check