Some strange hot fixes. We NEED an refactoring!
Maps: Add integration index