Added a setup manager and slightly adjusted map builder sample