Added PW to schema