[demo05] Smarter map creation