Updating to support new features