Made waddelcert configurable