Add Manta support