Structure for 2.3 added