Added remaining classes to data layer