Simple map added. And more