Add support for ESRI layers

Also features me using more single quotes.