CA 0.1

Updates on map loader