Some optimizations and architectural changes.