replaced custom vocab with schema.org