Updated to match new prototype
Implemented field removal from data lists