Added fields to L2 data tables; fixed L2 data loading function;