Some updates to EAN structure