Updated for shark deprecation.