Updated HDB structure