Updated to use environment port