Refactor to use ip-relative addressing