Add Table properties

Move local vars to class properties