Make immutable data from actions optional