Add new features for Table