Bugfix: Replaced ipAddress variable with network variable
Updated: Refactor implementation internals for a more reliable solution