Added slug support