Adding schema support