Added basic IP support