Refactored to use syntax quoting