Consistency in key field data class
Removed todo list