- Major update to action helper to follow better object oriented patters