Added 'plain map' support