Updated inheritance and added includes.