Add immutable check