replaced all Properties to Map