Simplified ES core structure. Began performance optimization.