Updated machado with map backbone