Updated rule builder
Updated rule builder