Changed Basic Model class to typedef