Update to new requirements