Added todos in TODO