Fix #6: Eve maps integration