Updated for new feature uuids