ActionsParser refactor

Why this change? Is it needed?