added basic schema support