Worked on Improving the classes