(refactor) Fix for chain architecture