Moved to PostGIS and added more layers.