Changed infrastructure to load from WMS for efficiency