Restructuring function mapping. Moving from a utility class to DataTable