Fixing models, adding map.