Changed Class Name as per their respective responsibility