Moving the Code to Base Class