Move to data modal for 2.x