updated to use new Structure trait