RBBI Rule Enhancements