Added apostrophe support