add: re-implemantation using Tabulation class