Should we use TodoItem for consistency?