Refactor Phase 1 - Added missing Schema Name override