Restructured and more data & domain work