Issue 72 custom canonical list