#691 : Performance Enhancements