Add the EdgeRules ftl and additional changes to