Tabulations support - closed #3