Added class to structure draft