Static Generation - Phase 1 Changes