Try to fix sherlock and support v4 components