Added support for mutable and auto vis a vis raet changes