Minor refactoring of chain
Bump version