Added 64 bit GPX framework and map states