Merged optimizations with extra file parsing