Moved properties to instance level