Simplify rule base as it no longer handles db model