Removed the dependency from with_slots
Fixed a merge conflict