Added more schema