Adding missing class definitions