Adding the BaseClass to the solution