Implementing abi code review