Several Performance Improvements