Replaced session argument by resource resolver