Worked on class definitions