Added proprietary files for S3 and P4