Support both variants on mar library