Adding comments and a few fields for future features.