committing the missed changes
This class is required since item and user based are separated
committing the missed changes