Modified ActionImpl and UnsecuredActionImpl