Performance Improvements for ToDo