Comply with 3.6.1 structure