Making ready for integration as DataTank module