Added checks to handle if new features are not available