switched draw schmema mapping to production tier (QA is gone)