Added ArcaMax support