Added support for $super + added ContractStore