Add changes to make maps and examples