Added embedded/complex schema support.