Add schema types to data layer