Improved and bugfixed the Sluggable module