Basic data mapping added
Naming consistent with devtools
Break event tests