(refactor) Updated to chain-link architecture