Move update logic into DefineList.
Merge pull request #172 from kwando/master

Move update logic into DefineList.