add schema support