Change the map quad API

Make it more consistent and always put the index first