Refactoring towards nmcli abstraction