Refactored wrapper to use some collaborators