More progress on schema support