EJPLUGIN-157;  Table/tree related refactoring