Added class as described in structure