Worked on class structure