Improvements based on usage