Add Port
Refactor JSON Format