adding missing legacy classes