Adding Slug and Other Improvements