Added more schemas