todo task for gci to elaborate fields

Todo Task for GCI task : https://www.google-melange.com/gci/task/view/google/gci2014/5038048144261120