Performance

Broad Performance Improvements