Refactor Trashing API