Better embedding tables design