SCP quotes enhancements