Separate actual state holding from unit of work