Adding multi-schema support