Remove unused data object field
Override less of the parameter adding method
- Remove unnecessary scope capture