Fix for schema scoping issue