Moiz, Suraj & Dave: Fixed entity mappings
Moiz, Suraj & Dave: Added concept numeric metadata to submission payload