Add haida support