added TableOption enums, MapBuilder
merging