Restored certifications and added feature control