Convert class instance var to instance var

To allow duplication mechanism