Added tablular mappings