Fix immutability
Update doc