Updating to the new feature api