Continuing Sherlock integration