Add sherlock support