Added class definitions