Fixing schema issue