Add support for single quotes in values