Updated data inputs
Removed user references, updated data collection
Removed User references