Feature/mapit failover