Please create a Jira that describes exactly what you used to do, and what you ultimately want to be able to accomplish. It sounds like you used to rely on a state Map returned from another class as being not immutable and directly modifying it? Not sure I have ever seen that documented as a good practice