added Map, Layer and DAO/serialization stuff