Added custom slug support