Adapted types to new schema.