Added a more robust slug