#691 - Performance Improvements