Updated map syntax for better support