Added port checks