(refactor) Updated for chain architecture