Support for additional basemaps. Also fixed major issue with getcapability / populate layers