Split Databag in to separate class as I would now need this