Dan, I've changed the name to ```CommitManager```. Also, removed the ```EnumSet``` from the map and now I use a ```DiscardPolicy``` enum. Is it better?