Unit of work behavior change