Changes compatibility with Deep feature s3