Updated catalogue structure