added table mappers to reduce memory footprint