Add better tabn/tabp maps