Fixed some methods, cleaner calls of functions. DataElements are listed in a table with ID's