Added data layer classes