Add supprt for manta and removed unused overlay