Changes support lib to match the sherlock one