Updated structure classes