Update to reflect new features