Updates for immutable types support