Updated some map support