Added some structure