Add Loki support