Add custom map support