Updated forms rules engine