Added more port mappings