CFRCPRAP-185: make sure to work with Tables