Moved table mapping to new feature structure