Nice find. I'd rather keep things simple, though. I'm not worried about creating a new Properties here. How about a util method that just instantiating a new, empty constructor Properties and iterating through the entrySet of the one passed through to just add the values? I'd rather do that then special case tenantId.