Added custom rule feature