Added support to handle multiple schemas