Added optional ports