Fixing schema issue in distributed env