Modified structure to fit the new styling