Added some structure classes