Added interfaces to abstract the Model and Record functionality; Adapted the Rule classes to work with the new interfaces instead