Refactor: Remove addrrange type