Refactoring and update to use a list of items to not drop