ADA merge

Update framework to ADA