Add forwarding rules to the new config format and do a little rewrite on
the models