Added identifier quoting