Made independent from DataModel class