Adding a data parsing class for v2