stateful mapper should work now