Improve Tablist mappings