Match new requirements