Fixed attribute names and AddTodos