Revert "Reverting some changes"

This reverts commit ade53e905ea9facd86b8437c0130ac26d5252cd9.
Revert "Removing actionHandler"

This reverts commit d6ba69b9fdc29c07a23ad9302dd1eb3d6b7205c4.