Added support for two ports