Added port,password, other changes