Add some structure to general section