Added support for single quotes