new resources, minor data model changes