Fixed class definitions