Support for deeper structures added (struct can be used for organization, not just used for section)