More S3 conversion of prop functions