Add more end maps and fix offset