Code review comments
Change the way we handle the data fields