Update to add current features