Changed data elements

Changed data elements for generalization of functionality.