Minor refactoring
Minor refactoring
Adding chain generation to action class
Adding chain generation to action class
Fixing issues