Reworked structure so that it aligns with 3.7