Initial changes for 2adi implementation