Added custom indicators back