Added more schema tags