Added port mapping support