updated schema tags as best I could