Added auto-disable for port mapping