Update HW to split data into separate module