Revamp IP/UA storage and improve space in assignment table