Added Infrastructure and Model classes