Add schema support